Issue 62 more build options