Merge pull request #15 from vikramrajkumar/master

Latest upstream merge + associated fixes
merge
merge
Merge pull request #24 from nmushegian/master

improve CLI and printing... plus huge DNS update from vikram
Update fc submodule