too many things
Merge pull request #83 from milneti/master

Pulling latest from master