Merged Pull request #81 - resolved conflicts