Merge pull request #26 from tartansandal/kal-oct-11

Kal oct 11
Merge pull request #36 from paulkotz/master

Merge pull request #26 from tartansandal/kal-oct-11