Merge pull request #31 from dupps/master

Merge pull request #10 from cbos-team/master