first commit
Merge http://github.com/todorovich/csc