Merge pull request #32 from nvembar/master