line number bugfix, other stuff done.
Merge branch 'master' of github.com:SimpleTasker/SimpleTasker