fixes #7 and also resolves #6 for now
Merge branch 'development'