Added -f, -n options, some improvements
version 0.0.7