fix for issue #27
wip
wip for issue #25
remove depracated
Merge pull request #30 from wri/feature/dev-setup

WIP for adding dev support