Merge pull request #59 from jentfoo/unstable_staging

Unit test improvements and issue #58 resolution
Merge branch 'unstable_staging'
Merge branch 'unstable_staging'