Merge pull request #2 from aftersunday/master

pull to Monday Jsc