Dev

Fix for issue #15