Merge pull request #12 from zde/master