Merge pull request #30 from Benbow/master

Mica 968