Merge pull request #11 from AlexNaj/dev

Dev
Merge pull request #12 from jparishy/dev

Dev
syntax
bug fix and cleanup
worked out the bugs
skeleton date to remind