parsing bug
Merge http://github.com/breaklee/etc