merged from master
Merge pull request #6 from fehguy/master

merged from master