Merge pull request #1 from fbt/dev

Mergind dev to master as it is stable enough
Merge pull request #2 from fbt/dev

Dev
Merge branch 'dev'
There are no groups anymore
Merge branch 'master' into dev
get_pid should take precedence