probably will cause some errors/conflicts...
Merge branch 'master' of github.com:veljamatic/bicwp