Dec7'13 commit
Merge pull request #2 from stuc3386/master

Dec7'13 commit