#17 added in support
#17 added between support
[#18] Build fixes
#18 preparing for merge