** Added tests to replicate issue #155
** Fixed issue #155
** Fixed a bug that caused integration tests to fail
** Added set of tests that prove Issue #135 as invalid
Merge branch 'devel'