Merged Pull request #80 - resolved conflicts