fix #36: some locking added
fix #36: a little fixes
fix #36: now using .lock file for locking because of flock is strong environment-dependly
Merge branch 'master' into issue-36
fix #36 - error messages in AggregateCommand displayed as info messages
Merge pull request #56 from intaro/issue-36

Issue 36