add from and to placeholders
Merge pull request #52 from Pathologic/master

add from and to placeholders