Bug fix and blueprint move to views
Merge pull request #12 from ehenneken/blueprint_move

Bug fix and blueprint move to views