Merge pull request #220 from xithan/develop

wagn 1.14 - a few more tests and we are ready to go
Merge remote-tracking branch 'wagn/develop' into develop