1312 1223
Merge pull request #1 from alexiszorba/newtomerge

1312 1223