Add flock support
Merge pull request #33 from mathroc/feature/flock

Add flock support