Merge pull request #43 from rtlechow/master