updated with missing api changes
updated some more API changes, closes #235
fixed mrege conflict from develop
Formatting
Removed macosx folder (closes: gh-70)
Removed mswindows folder (closes: gh-71)