Merge pull request #1 from Ernest314/development

Development
Stuff on 1/8/13
Merge pull request #51 from shortenda/development

Development