BUGIFIX: closing issue #16
MERGECONFLICTFIX: fixed merge conflict with local branch