Merge pull request #370 from Twists/master

1-24-2013
Merge pull request #13 from Jiyambi/master

1-24-2013