Issue 1 alternative entry

Merge of alternative_entry to master branch.