hexylena Merge pull request #35 from fubar2/master