Merge pull request #25 from cyprusglobe/master

Refining and cleaning up a few things