A few more finishing touches
Merge pull request #19 from vidaha/vida/20140818

A few more finishing touches