Multiple commits updated to be merged with tip...

See PR #17 for more details about the updated PR