changes September 19th 2013
Merge pull request #248 from panique/develop

changes September 19th 2013