Changes for 1.2 Beta 4
Merge pull request #6 from gmoromisato/master

Changes for 1.2 Beta 4