Merge pull request #2 from barak/master

minor patches generated while packaging for debian

tested that it builds on fedora18...  will test the application on Monday
Merge branch 'upstream'