Started work on issue #4, need to switch to release branch for fixing some issues