issue#24 done and #25 inprocess
Merge branch 'master' of https://github.com/tanathos9/ebnord into superuser_index