Immutability
Merge pull request #5 from liuggio/master

Immutability and minor fixes