Merge pull request #85 from aequasi/master

Rewriting logic for Including Third Party Blocks
Fixing small issue
Merge branch 'master' of github.com:bldr-io/bldr

* 'master' of github.com:bldr-io/bldr: