Merge pull request #6 from acesarewild/master

updates(3/5/13)
lots of changes apparently
Merge pull request #19 from aquang93/master

lots of changes