Fixed Empty String

asdf
Added some error stuff and fixed minor bugs
Merge pull request #33 from Vandenn/master

Pull