Maintenance/merger spec

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Unit test passes: ?
Phpspec specification passes: yes
Checkstyle issues: no
ChangeLog updated: no
Fixes the following issue: #131