On load solution for #127

This is the first part of the solution for Issue 127. Second part will
be to create functionality on action.