Module: Bean Pane
Merge branch 'james'