Initial jet lagged code review fixes for #12
Merge pull request #13 from pretenders/alex/dev

Initial jet lagged code review fixes for #12