Merge pull request #4 from CyberTailor/master