Merge pull request #27 from BusinessMate/master

MergePullRequest