Merge pull request #34 from paulkotz/master

Merge pull request #24 from tartansandal/kal-sep-13