roll v1.1.3
Merge pull request #24 from neocotic/wip-1.1.3

1.1.3 WIP