Dev

Contains changes to fix issue #30