Merge branch 'trunk' into 1.2
Merge branch 'trunk' into 1.3
Merge pull request #6 from serumax/1.3

1.3
Merge pull request #5 from serumax/1.2

1.2
Merge pull request #7 from serumax/master

trunk to master