set up guard for QA purposes
Finish merge from Ticket0100
Boost the version number to 0.4