Travis added dev branch
Refactoring
Added deprecated typedefs
Updated readme
Cleanup main header
uploaded windows changes
uploaded windows changes
uploaded windows changes