Removed circular check, it was causing problem. Reopens #13
Merge branch 'dev'