minor fixes
Merge branch 'master' into rpsec
Merge pull request #19 from chicktechorg/rpsec

minor fixes