Merge pull request #2 from AuroraNetwork/master

Pull Request - 11:42 PM - 1/28/14
Merge pull request #3 from AuroraNetwork/master

Update
Update
Update
Merge pull request #5 from LegitModern/master

Update