Latest updates
Merge pull request #15 from Waterloodown/master

Latest updates